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

Change-Id: I5e20514d05f001eaac1a6fe16403f7016c463ad9