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

Change-Id: I2405cd71c559953f735b16de39b48699ef8c5066