Merge "Remove removed-dex-api generation"