Android n preview 1
Merge "package version metadata for external/"