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

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

Change-Id: Ie30a7e0dacace5059423587f87ef7ea876fc5e0a