Android CTS 7.1 Release 25 (5240545)
Merge "package version metadata for external/"