Merge "Convert libui to Android.bp" into nyc-mr1-dev-plus-aosp