Merge changes I4588e7da,Ic4a70a1b into nyc-dev
am: 56f949b

* commit '56f949b44a4c8d287c7f3028695eceb07ae41f54':
  Fix Emulator CTS tests for Camera, Location, Sensors, Telephony
  Camera: Disconnect camera after checking flash unit

Change-Id: I0d812f7a6e344c58c56905ecebbdea6e8f819530