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

Change-Id: Iaec917a412dd2342979d00326d194854d9384990