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

Change-Id: Ic6c9ce334bfd0954f84b620bb4e199260743ae1f