Merge "package version metadata for external/" am: 30dc5b6cbc
am: 3e7f4e1c83  -s ours

* commit '3e7f4e1c837e092f9518c8591b8bcc50938009bb':
  package version metadata for external/