tree 872990dc4d5df26e3fe8af9d8e4379cc16f20ce6
parent 11536fb0625535a66fc4c1740d37e3769742f002
parent 0a652331685b35f4e1d879284c592531b670cbd5
author Colin Cross <ccross@android.com> 1544818716 -0800
committer android-build-merger <android-build-merger@google.com> 1544818716 -0800

Merge changes from topic "revert-soong-dexpreopt" am: b334d17103
am: 0a65233168

Change-Id: Ie49a0f06ffa8e8744f6253dd8942c9ce77fba452