Android 7.1.2 release 25
Merge "package version metadata for external/"