Merge "Support legacy and vndklite mode"