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

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

Change-Id: Ifa072f793605d6dcb7d71cca05bc296faaa0c40a