Dmitriy Ivanov 9185e04f72 Apply work around b/19059885 to x86
Bug: http://b/19059885
Bug: http://b/21203348
Change-Id: Ic375e9f877d68de8f866d17362879a7dde638465
(cherry picked from commit 69a5fb951d69689dedd83cb033ae3dcd0ef05b65)
2015-05-15 18:42:14 -07:00
..
2015-03-14 12:17:45 -07:00
2015-05-15 18:42:14 -07:00
2013-02-01 14:51:19 -08:00
2008-10-21 07:00:00 -07:00
2015-05-12 10:33:20 -07:00