Merge "build: Eliminate cutils/str_parms dependency from system/bt"