hg merge and ANDROID_HOME updated