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