Merge "BgDexopt: Reschedule job on timeout"
am: 45bd60b4e2

Change-Id: Ibe4e54f2f3ab0a7b1db3396cb1928a16b084f262