And the 3 Mac build fixes. Fix conflicts in context_x86.* . This reverts commits 3d2c8e74 , 34eda1dd , f601d195 , bc503348 . Bug: 19150481 Change-Id: I6650ee30a7d261159380fe2119e14379e4dc9970