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

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

Change-Id: I2e83aa4855c015505e20ef018b6f89635620cc59