Merge "Merge "MediaCodec: avoid double lock gralloc buffer" am: 762f74e018 am: f6f0bdd100 am: 99b5b46eba am: ce30f8308f BUG:201620357" into sc-v2-dev