Android CTS 7.1 Release 4 (3866195)
Merge "package version metadata for external/"