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

Change-Id: I8181bc01dd08cc65c3bba102a422bf3cee2b5762