Merge "[automerger skipped] Merge "Remove obsolete droidstub args" am:...

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

am skip reason: Change-Id Ic1e859dc6aa91f8d7b4f285b63d3faafb27edc9b with SHA-1 960c16cd is in history

Change-Id: Ia1505f6a26784945917e81bee5b0c2f2da8aa88e