Merge "Merge "Avoid cross compilation error in DoCallCommon" am: 22ae7b3b3b" into stage-aosp-master
am: d0b2a8c52e

Change-Id: Ica28d2bf98f4e4c7631e44bf9d99b89ccf701be7