Port for Android Build/Mac environment
am: a8830dcf25

Change-Id: I6e92cc466f4c3560537db23a9b5f1eff5b3ca5f8