Merge "Allow 'export WITH_HOST_DALVIK=false' to override Makefile defaulting" into gingerbread