Merge "Switch from dist-for-goals to dist in Android.bp"