Merge "Use timeout for *dexopt* wake lock" into oc-dev
am: bca6bd2b8c

Change-Id: If4bb1b78fc1cc3f8bc6987bd8bfcfa5738c5c0e9