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

Change-Id: Iaf836ccc98b305554d8c379682e79439b321af23