am 8e9072b0: Merge "Alias com.android.camera.Camera to point at...
am 8e9072b0: Merge "Alias com.android.camera.Camera to point at CameraActivity" into gb-ub-photos-arches
* commit '8e9072b0':
Alias com.android.camera.Camera to point at CameraActivity