fix build error for device
Merge branch 'master' of https://github.com/Blak-KANG/android_build