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

Change-Id: I57e6d9213430d75fbcfc6713d45fc0776d6df7eb