Merge "clean up libgui Android.bp" into qt-dev am: e6f6a7c4d7
am: 09edbc2685

Change-Id: I87630134dff0b82b9f41096d7c7ed6c1c4323fc9