am 3f3d6b85: Merge change 8622 into donut

Merge commit '3f3d6b85a038e1b54a53a1cdb4aca62995cf1cf7'

* commit '3f3d6b85a038e1b54a53a1cdb4aca62995cf1cf7':
  Fix LOCAL_CFLAGS/CPPFLAGS handling to match full Android build system.