Android CTS 7.1 Release 6 (4009365)
Merge "package version metadata for external/"