Merge "Camera: synchronize access to mHidlMemPoolMap" am: 0b8d9dd129 am: cabae1ec3e
am: df24e673ca

Change-Id: I2cc1c28a2956291fdb410d11e30bd4f863770a53