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