am c512fd06: am 9a176507: am b7a000a6: Merge "Unhide the key to retriever location information in 3gp/mp4 files" into ics-mr1

* commit 'c512fd065c2bb4f5d39bb13f45d3fb32370f6880':
  Unhide the key to retriever location information in 3gp/mp4 files