Merge "Move async package to com.android.camera" into ub-camera-haleakala