Merge tag 'android-7.1.2_r4' into aosp-7.1.2

Android 7.1.2 Release 4 (N2G47H)

Conflicts:
	core/build_id.mk
	core/version_defaults.mk
	tools/releasetools/add_img_to_target_files.py
	tools/releasetools/build_image.py
	tools/releasetools/img_from_target_files.py
	tools/releasetools/ota_from_target_files.py

Conflicts:
	tools/releasetools/ota_from_target_files.py
18 files changed