Merge "Support legacy and vndklite mode" am: 5cdad7a708 am: 9033ba7bcd
am: e3c6175e60

Change-Id: I398514945e13ac91dcabc213fd2f97c3d92286e6