Use name-suffix and dep-suffixes (aosp/2751102) and remove patches no longer needed as a result. Other minor cleanups to eliminate diffs in Android.bp files

Test: Ran cargo2android
Change-Id: I74136a3d1997a293184e50af916833d0a65da3f0