Android CTS 7.1 Release 1
Merge "package version metadata for external/"