Update cargo2android.json and Android.bp+patch

Test: mma
Change-Id: Ifceaa6355403f54ee9e2eb8b1304daeb277b2512