Android n mr1 preview 2
Merge "package version metadata for external/"