Merge "Use "-include" to not fail apps_only build."