Merge "Add source map for binaries from RBE" am: 7f5ba5360a

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

Change-Id: I0f19c252945c84fbeae65987c81c43aa7dddba06