Android 7.1.1 Release 33 (N4F26X)
Merge "package version metadata for external/"