Merge "Fix building librsrt_<arch>.bc." into lmp-dev