Android CTS 7.1 Release 15 (4607299)
Merge "package version metadata for external/"