Fix make file to fix build
Fix a bug in android_device

Merging kwd commit 5861bf1edda18872676d02749794ed64da67dfc8
Change-Id: Id063ea653f47c7743102c912a8480c0410df6465
1 file changed