Merge "Camera2: Switch to auto-gen C++ binder interfaces" into nyc-dev