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

Change-Id: I4c89b4d7c6db27dcb26d376609a7867e68fe8305