Merge "Revert^2 "[libprofcollectd] Fix binder import path"" am: 518e8f2572 am: fe604e0fb1 am: a25d5d06e1

Original change: https://android-review.googlesource.com/c/platform/system/extras/+/1954497

Change-Id: I5e6bf1ee39084481a48a7a772f51d30f8878608d