Merge "Enable VNDK for composer 2.4"