Merge "Remove removed-dex-api generation" am: 83d9ddc6cb

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

Change-Id: I726fc30f57f3ac71987b459f71fd20ae9a18a475