Merge "Build hwcomposer.default with the VNDK."