Merge "Update deps for rmtypedefs and mkstubs." am: 99a9d7be5e am: d480253149 am: 4def7525c1

Original change: https://android-review.googlesource.com/c/platform/development/+/2287993

Change-Id: I7b340bcd5d29b33de2402947b630edf5e24544c0
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>