Merge "hiddenapi: Better error message for boot cp inconsistencies"