Merge "Convert the abstract GoogleCameraHelper class to an interface am: 6dc63b06 am: cbd23ee5" into oc-mr1-dev-plus-aosp