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

Change-Id: Ibff2a854838fe6e555057e1a460a17b3ce0d5e8a