Merge "Change camera HAL to catch up with changes in emulator."