Merge "Revert "Add a warning to the atrace binary for deprecating vendo..."" am: 71e68dcfc4 am: fb78bc1c5a am: b84e614a65 am: 80f78ab4e3

Original change: https://android-review.googlesource.com/c/platform/frameworks/native/+/2149974

Change-Id: I1a07d017b2e04e227e9cb224dca00bad1a2b9dde
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>