Merge changes from topic "gralloc-drm_hwc-prep"
am: 9820de4a40

Change-Id: I15d1246cffa46d5b232cccd63e416ac038322c5a