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

Change-Id: I2ee72a0857d2a4e4756727d876eed227f6e68653