Android 5.1.1 release 12
Merge "gralloc: clarify lock_ycbcr in light of multimedia codec usage" into lmp-mr1-dev