Merge "Revert "Add support to androidmk_suffix prop"" am: bc2a5a25ee am: 3590ee637a am: e50585d2b2

Original change: https://android-review.googlesource.com/c/platform/development/+/1664085

Change-Id: I40164754478a87a6a83ba9d570a2e8f75ac59fce