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

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

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