Merge changes from topics 'soong_ui_installclean', 'soong_ui_version', 'soong_ui_clean'
am: 212c418ee7

Change-Id: I6596af49a99a6167a8908525ff8fe1c16e456e31