[automerger skipped] Merge "Revert "Add genrule for combined srcjar of modules"" am: 4d506d74 am: ddf88a50 am: 7a8204d6 am: 3c21dc5a -s ours am: ae2bba64 -s ours

am skip reason: Change-Id Ifb5f56bf5468969ad026f10186763ef604113adc with SHA-1 15eeedb5 is in history

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

Change-Id: I702cd00c52cb8f6d5af8f7f1a6bf4fe9ffb45eef