Merge "Convert VD/AVD to FastNative"