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

Change-Id: I0f3ce8715775d6e15ebf89aef37c4447bde1bb66