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

Change-Id: I50272b91305272a7b84d93434269e7cc0cdc5993