make build env. follow more of the AOSP guidelines