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

Change-Id: I4940abb4cf4e831f23f0af832693daf2a8f52607