Merge "Have cargo2android put warning not to modify Android.bp files"