Merge "Revert "Fix parsing of gps location atom in mp4""