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

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

Change-Id: Iaf6edafb24170b2d87d7b9b8d82b2c61ddbdda32