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