Merge changes from topic "soong_ui_java" am: a3d94873cf
am: f68edeafdc

Change-Id: I8bb6dab2e35006071dc4c2710f55fd3e54ffdab7