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

Change-Id: I346aacd4412dddc98b0d68979355ee7087d6d366