am 38e451f0: am 51d3d176: Merge "Within CpuConsumer, use gralloc lockAsync/unlockAsync" into lmp-dev

* commit '38e451f0574de257eb46d0ba8c9a07c1556db24d':
  Within CpuConsumer, use gralloc lockAsync/unlockAsync