Merge "Switch to soong_ui to dump make vars"
am: 1b8376c812

Change-Id: I468adc88860e57a12f24e0ae8d89edca70179c5e