Merge "add ANDROID_HOST_OUT to env (please do not merge)" into gingerbread