Android CTS 7.1 Release 18 (4800211)
Merge "package version metadata for external/"