Merge "Update prebuilt to reflect recent HardwareConfigHelper changes"