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

Change-Id: I652caf38a4a3f78b9a5a13ef568fd8c72a0f38ad