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

Change-Id: If5b775a6a1f494b1b8d30b68cedbcaef0bb8e6bd