Android CTS 7.0 Release 2 (3340807)
Merge "package version metadata for external/"