am f141a77c: am 16601acb: am 30bfe8cc: Merge "Switch to MetadataExtractor path."

* commit 'f141a77cdfdda8b1e2c5ae08bfd7e795df7ffd77':
  Switch to MetadataExtractor path.