Updates made to build with new dalvik and libcore