Merge "Add camera.ranchu.* to target/product/emulator.mk" into nyc-dev