Merge "[automerger skipped] Merge "Remove obsolete droidstub args" am: 8b9e50c2 am: 282c777f -s ours am: c39006a0 -s ours" into rvc-d1-dev-plus-aosp