Merge "Mark libui and libgui as VNDK in Android.bp" am: 9a8ea13a26 am: 261b90e385
am: 1961948e6f

Change-Id: Ic8f5f51a2cf33fddf02b8d0e351609fe87f5bb6b