Merge "cts: Fixbuild" into lmp-dev