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

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

Change-Id: Ib73e8993b3fc8de7e0e21693080f34883fc7a6bb