Merge "Revert "Move to NDK r21.""
am: 878a55981d

Change-Id: Iedda62441a15cae2cea9c9ee6d539a1a52047a00