fix variable errors
Merge branch 'master' of https://github.com/700nighthawk/android_system_build_core