Merge changes from topic "am-1080ec7ba42e43deb09da114213649dc" into rvc-qpr-dev-plus-aosp

* changes:
  [automerger skipped] Merge changes from topic "adbd_cp" into rvc-dev am: 58d80650 am: cae22914 am: cf810b57 -s ours am skip reason: Change-Id Ibfb92a7c197a25fd1913107d277fbc5f78108c05 with SHA-1 e36a53e3 is in history
  [automerger skipped] adbd: fix build breakage. am: 3467ef46 am: 26e0c728 am: fd6474bd -s ours am skip reason: Change-Id I091ef9dec806c767ffb21a5fd73b2bb37ab29ff9 with SHA-1 3467ef46 is in history
  [automerger skipped] adbd: remove static dependency on libcutils. am: b5778c1f am: 30b9d37f am: 82e3e406 -s ours am skip reason: Change-Id I821fa174cfcbfa8e29a4be10de4016b817adbaf8 with SHA-1 b5778c1f is in history
  [automerger skipped] incremental_server: fix a use of uninitalized memory am: 15c7a3f8 am: 23835e12 am: 66cec14d -s ours am skip reason: Change-Id Ib844aa4ab3ebb297ca8f6f4289bbe3212275275b with SHA-1 15c7a3f8 is in history