Merge "Fix cdex bugs to enable ART_DEFAULT_COMPACT_DEX_LEVEL=fast tests passing" am: 7861b4be am: 016f5c1a am: f64bacc9 Change-Id: If3a0fdf17d448a538d40bb3dc102f0ee85c6d300