Merge "Stop creating $ANDROID_BUILD_TOP/{&&,mkdir} directories."