Add missing defines to PKG_CFLAGS

Change-Id: I7e4234cf194f10aba1a16cfa81774b8f1941ca76
Merge "Add missing defines to PKG_CFLAGS" into release-4-6