Merge "camera2-api: Tag camera2 JPEGs with any provided location" into lmp-dev