Merge "Fix cdex bugs to enable ART_DEFAULT_COMPACT_DEX_LEVEL=fast tests passing"