Merge "HACK: don't override DX when running make"
am: fee3e21264

Change-Id: I9ce0b1fc8e30fd0ccc6810d5dfa4a6ed88941006