Android 7.1.0 release 3
Merge "package version metadata for external/"