fixes to android build post merge