Merge "Fix statusfile used in dexpreopt" am: 77cdde7d91 am: e706cc8c42 am: 6db67ee4d8

Original change: https://android-review.googlesource.com/c/platform/build/soong/+/1831862

Change-Id: Id0b7822db4298f5a9e46bf2b85d8110aa2ac0375