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

Change-Id: I47de667961454ba1ed90e44cfebfac52c906078c