Merge "Revert "Add a warning to the atrace binary for deprecating vendo...""...

Merge "Revert "Add a warning to the atrace binary for deprecating vendo..."" am: 71e68dcf am: fb78bc1c am: b84e614a am: 80f78ab4 am: d00a3104

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



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