Merge remote-tracking branch 'remotes/origin/lk.lnx.1.0-dev.1.0' into m-auto

Conflicts:
	AndroidBoot.mk
	app/aboot/aboot.c
	app/aboot/mdtp.c
	app/aboot/mdtp_fs.c
	app/aboot/mdtp_fs.h
	app/aboot/mdtp_fuse.c
	app/aboot/mdtp_ui.c
	app/aboot/recovery.c
	app/aboot/recovery.h
	dev/gcdb/display/fastboot_oem_display.h
	dev/gcdb/display/gcdb_display.c
	dev/gcdb/display/gcdb_display_param.c
	dev/gcdb/display/include/panel_adv7533_1080p60.h
	dev/gcdb/display/include/panel_adv7533_720p60.h
	dev/vib/vibrator.c
	include/platform.h
	include/target.h
	kernel/main.c
	lib/openssl/crypto/asn1/a_int.c
	platform/init.c
	platform/msm8996/acpuclock.c
	platform/msm8996/include/platform/clock.h
	platform/msm8996/include/platform/iomap.h
	platform/msm8996/include/platform/irqs.h
	platform/msm8996/msm8996-clock.c
	platform/msm8996/platform.c
	platform/msm_shared/ab_partition_parser.c
	platform/msm_shared/boot_verifier.c
	platform/msm_shared/dev_tree.c
	platform/msm_shared/flash-ubi.c
	platform/msm_shared/include/ab_partition_parser.h
	platform/msm_shared/include/boot_device.h
	platform/msm_shared/include/boot_verifier.h
	platform/msm_shared/include/mdp4.h
	platform/msm_shared/mdp5.c
	platform/msm_shared/mdss_hdmi_pll_8996.c
	platform/msm_shared/menu_keys_detect.c
	platform/msm_shared/rpmb/rpmb_emmc.c
	platform/msm_shared/smem.h
	project/msm8996.mk
	target/init.c
	target/msm8952/mdtp_defs.c
	target/msm8996/include/target/display.h
	target/msm8996/init.c
	target/msm8996/oem_panel.c
	target/msm8996/target_display.c

Change-Id: Ie0aef5fd7e40d07df0b82aaa3e57a2672a56cb43
Signed-off-by: Vivek Kumar <vivekuma@codeaurora.org>