hiro
Add changes for android release
hiro commited 492a32ee8 at 2018-09-06 18:44:07