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

Change-Id: I45f1f89fec49d0dd78c999c4ffce4e2d06b87ea0