Merge "Automatically include <android/ndk-version.h> from every header." am: d4e1db56b8 am: 1011864f41 am: 231d9f41a0 am: 7c15f3d222
am: d4123f9af6

Change-Id: Ic276da518e76877950802f2266536a2b1b965184