Merge "Revert "Add support to androidmk_suffix prop""