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

Change-Id: I4491e1dbb5cf67114ce266da939286e6bd6409f8