Merge "Include cts-junit target for cts tests." into lmp-dev