Use a new cargo2android.py feature to insert blocks into Android.bp
files instead of having a patch.

Note that we do make one change to the Android.bp file but it
shouldn't matter.

Test: Run cargo2android.py
Test: Run some tests
Change-Id: Ia14941989c190a257d23cea5f855faf8c9d83c7f