Merge "Remove removed-dex-api generation" am: 83d9ddc6cb am: 4f3d7a966f am: cbeab42fd6 am: 82cbd820f8

Original change: https://android-review.googlesource.com/c/platform/frameworks/base/+/1457761

Change-Id: Iab0d1daf4c564c69460f4241b3269e38f769d537