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

Change-Id: I301ec314cb3d362d514007641c81bc7f43297983