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