Merge "Use OUT_DIR in atree to find android.jar"