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