Merge "Revert "Fix parsing of gps location atom in mp4""
am: 66688d8836

Change-Id: Ied910cce62fdbd3331b23c59b637007b89bc66d3