am bfed64d0: am 336f88ed: Merge "camera2-api: Tag camera2 JPEGs with any provided location" into lmp-dev * commit 'bfed64d0':