Merge "Fix parsing of gps location atom in mp4" am: bdccee1eee
am: 1a3af9525a

Change-Id: I25d9fa96a32bfa4c40e2650e0e6273003ef4edf4