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

Change-Id: I7dc48b8419376018bfb8e47313cbdebc1316b770