Merge "Camera: fix emulator deadlock" into oc-dr1-dev
am: 84201fee0b

Change-Id: I0761a575e3526a56bf60ca84913db55cfeaba416