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

Change-Id: I6a8a57d435ce888920cbdeb00b6e48c46a4f6d54