Allow the use of the NDK r16 or r15.
Allow the use of the NDK r16 or r15.

baldwinn860/gapid,Qining/gapid,google/gapid,google/agi,baldwinn860/gapid,baldwinn860/gapid,pmuetschard/gapid,Qining/gapid,baldwinn860/gapid,google/gapid,baldwinn860/gapid,dsrbecky/gapid,pmuetschard/gapid,pmuetschard/gapid,dsrbecky/gapid,pmuetschard/gapid,google/gapid,google/agi,pmuetschard/gapid,dsrbecky/gapid,google/gapid,Qining/gapid,Qining/gapid,google/gapid,pmuetschard/gapid,google/agi,google/gapid,Qining/gapid,google/agi,google/agi,baldwinn860/gapid,Qining/gapid,Qining/gapid,baldwinn860/gapid,google/gapid,pmuetschard/gapid,dsrbecky/gapid,dsrbecky/gapid,baldwinn860/gapid,google/gapid,pmuetschard/gapid,google/agi,dsrbecky/gapid,dsrbecky/gapid,Qining/gapid,google/agi,google/agi,dsrbecky/gapid