Merge tag 'android-7.1.2_r2' into cm-14.1

Android 7.1.2 Release 2 (N2G47E)

Change-Id: I14ec26c4095eaf18fdf05bca4ea42092c5b20a90

diff --cc verity/Android.mk
Simple merge

diff --cc verity/build_verity_metadata.py
index 5e42c6d,71e66b4..e638932
--- 1/verity/build_verity_metadata.py
--- 2/verity/build_verity_metadata.py
+++ b/verity/build_verity_metadata.py
@@@ -33,11 -50,10 +51,12 @@@ def sign_verity_table(table, signer_pat
          with tempfile.NamedTemporaryFile(suffix='.sig') as signature_file:
              table_file.write(table)
              table_file.flush()
-             cmd = " ".join((signer_path, table_file.name, key_path, signature_file.name))
+             cmd = " ".join((signer_path, signer_args, table_file.name,
+                             key_path, signature_file.name))
              print cmd
 -            run(cmd)
 +            runcmd = cmd.split()
 +            sp = subprocess.Popen(runcmd)
 +            sp.wait()
              return signature_file.read()
  
  def build_verity_table(block_device, data_blocks, root_hash, salt):

diff --cc verity/fec/Android.mk
index 0b742c1,5fff9c3..400735f
--- 1/verity/fec/Android.mk
--- 2/verity/fec/Android.mk
+++ b/verity/fec/Android.mk
@@@ -20,24 -19,4 +20,4 @@@ LOCAL_STATIC_LIBRARIES := 
  LOCAL_SHARED_LIBRARIES := libbase
  LOCAL_CFLAGS += -Wall -Werror -O3
  LOCAL_C_INCLUDES += external/fec
 -include $(BUILD_HOST_EXECUTABLE)
 +include $(BUILD_HOST_EXECUTABLE)
- 
- include $(CLEAR_VARS)
- LOCAL_CLANG := true
- LOCAL_SANITIZE := integer
- LOCAL_MODULE := fec
- LOCAL_FORCE_STATIC_EXECUTABLE := true
- LOCAL_SRC_FILES := main.cpp image.cpp
- LOCAL_MODULE_TAGS := optional
- LOCAL_STATIC_LIBRARIES := \
-     libcrypto_utils_static \
-     libcrypto_static \
-     libfec \
-     libfec_rs \
-     libbase \
-     libext4_utils_static \
-     libsquashfs_utils \
-     libcutils
- LOCAL_CFLAGS += -Wall -Werror -O3 -DIMAGE_NO_SPARSE=1
- LOCAL_C_INCLUDES += external/fec
- include $(BUILD_EXECUTABLE)