Merge "Fix BackgroundDexOptTest" into pi-dev
am: ddc4e1ab06

Change-Id: Icd564239c493ed402fe9914f52c48da72a3d58db