Fix some missing defaults. am: e387802d5c

Original change: https://android-review.googlesource.com/c/platform/art/+/1900552

Change-Id: Ib0eac3ecc4f0f670b680e613939b74f608af3569