Merge "vndk-ext should come before vndk(VNDK APEX)"