Merge "Within CpuConsumer, use gralloc lockAsync/unlockAsync" into lmp-dev