Merge "Use filegroups for the droidstub txt files" am: 134ad282 am:...

Merge "Use filegroups for the droidstub txt files" am: 134ad282 am: 2880f60f am: 71ab6ddb am: 64549608 am: db0db25d

Original change: https://android-review.googlesource.com/c/platform/frameworks/base/+/2469524



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