Merge "Remove legacy make env variables"
am: 5b294caa8d

Change-Id: If7d8596d156475040dba78bdeb007a5b005c3dd6