Merge "Initialize dex cache while holding dex_lock"
am: 7638651be2

Change-Id: I067b023de98cc6d559437f01339ef814ca9fadde