Merge "SSE4.1 is part of the Android x86/x86-64 ABI." am: f99fc25482
am: 34a7c8bbad

Change-Id: I847893ddb5309ad109984a83c8de00b82e2a114c