Merge "Convert external/drm_hwcomposer to Android.bp" am: 02f1096918
am: 11530be6c0

Change-Id: Ia0ab41b7cd0268150d9a2bca7e54ad124fe4ffd5