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

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

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