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

Change-Id: I76c418afb4fcc427686c25d3ba812e241a431453