Merge "Fix two problems in the ExecuteBinary function." am: e0561210b2 am: b16d968e54 am: 43ce684e3b

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

Change-Id: I9472707d7d680ad63794ed4b61ecd1e4506ae5c5