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

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

Change-Id: Iae08214e11873a8b3b3ecfc619ff47ea8c50401a