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

Change-Id: Iccf408c893ad2ff97a861fd994364b14e2080ba6