Merge "Camera2: update API per API council review" into nyc-dev