Android 7.1.2 Release 6 (NHG47K)
DO NOT MERGE: Build a static bspatch for recovery.
am: 2eea58f169

Change-Id: I3847e9df2ef422aee52e997829a65235b6269a19