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

Change-Id: I65e1bfc6fb1e8442758c39a8b625dc83f40a78b9