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

Change-Id: Id065e6377d132e51f4a3cfd0d8ddda4ccab4d699