Merge "Re-enable test 529-checker-unresolved in `no-prebuild` configurations." am: a5d5fa3955 am: deaa56e207
am: fa1c6baacc

Change-Id: I3385b741f9a44f67cbde15acd8e979ee257be54d