Merge "Camera: ensure lock ordering (device->session)" into nyc-mr1-dev
am: 58b4623d1f

Change-Id: I8c92a36230ae4b838cd06f421fdf8359e9a8a966