Merge "Unify NDK platform headers." into gingerbread