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

Change-Id: I0f356a4e4dea330f5fa68cdb46360ecb861883e0