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

Change-Id: I6a0c3d8c3c9d02eab56101c4dffb4a4a3e2a90f1