Merge "Remove ld.config.recovery.txt build"