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