Android 7.1.1 release 2
Merge "package version metadata for external/"