Merge "Convert MultiDexLegacy* tests to Android.bp and d8 --main-dex-rules"