Merge tag 'android-7.1.2_r29' into android-7.1

Android 7.1.2 Release 29 (NJH47F)

Conflicts:
	default.xml

Change-Id: Ieebc9359ff9834db079ea0db5085877a95a6fdae

default.xml

@@ -4,7 +4,7 @@
   <remote name="aosp"
            fetch="https://android.googlesource.com"
            review="android-review.googlesource.com" />
-  <default revision="refs/tags/android-7.1.2_r27"
+  <default revision="refs/tags/android-7.1.2_r29"
            remote="aosp"
            sync-c="true"
            sync-j="4" />