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

Change-Id: I49487f5f9c6b7ba74d9f460815d86b00e34d5676