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

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

Change-Id: I6fdaa9561706a3d58cf776a47c05c65886b6db1b