Merge "Fix NDK x86 build." am: be49ee652a
am: e8a86aa60c

Change-Id: I17aac83cf55a109a150c5ce99a14a4cb047b4277