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

Change-Id: Ia4d7f2933067bab27e6358aac3fc7080d828cc32