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

Change-Id: Ib8431b604a5a12f7bd2ab6c434ab198da0df9416