Merge "hikey{,960}: Enable system-as-root and verity." am: 72ef1bb611 am: 43310c6c1b
am: f52cd42683

Change-Id: I91ed059d253c1e03ae4b13414107c046ea463c2f