Merge "Fix parsing of gps location atom in mp4"
am: a803165abc

Change-Id: Ib3f3de6d5ee317ca9e062b1c6d810deea1116201