updates to use new AndroidCommon lib