CameraModule update. aim_android_library update corrections