Merge "Fix BackgroundDexOptTest" into pi-dev