Android 7.0.0 release 1
Merge "package version metadata for external/"