bionic and dalvik from our git