Merge "Enable support for External AP build"