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

Change-Id: I60ad4328064395e6d5adb617108bb814ac3d8705