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

Change-Id: Id28b8512324e1b808e2179a1a12df62ea9848e48