Revert "Move to NDK r21."

This reverts commit ff4d4ada4395e6300d141304ce739767061ff798.

Reason for revert: broke x86 build

Change-Id: I7722177d126fbeda5b394fc2399395c184c8e624
2 files changed