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