Port for Android Build/Mac environment am: a8830dcf25
am: 087bd70f9a

Change-Id: I054738c79bf85a3f919f8512bc3aaed1d7660fe2