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

Change-Id: I29a49ff5e51c3a20398a6e90f512fc5e22a896d0