am bdb2e9f3: am 46fc2341: Merge "Allow \'export WITH_HOST_DALVIK=false\' to override Makefile defaulting" into gingerbread

Merge commit 'bdb2e9f3c203655648bd0a4e5ea64e9bb2cb2a13'

* commit 'bdb2e9f3c203655648bd0a4e5ea64e9bb2cb2a13':
  Allow 'export WITH_HOST_DALVIK=false' to override Makefile defaulting