Merge "Mark libui and libgui as VNDK in Android.bp"