Android CTS 7.1 Release 24 (5131712)
Merge "package version metadata for external/"