Merge "CAMERA: add offline aidl interface"