Merge "Reland "Move to NDK r21."" am: 9bc4ada44e am: 8d899d5b8e

Change-Id: Ibaaec844b291cd1b0745f5a0d5e899b28ecb9f94