Merge "Camera2 API: Rename package to android.hardware.camera2"