Merge "Initialize dex cache while holding dex_lock"