am 732b2ba7: Merge "Don\'t include system/core/include/arch/<arch>/Android.mk for apps-only build." into jb-mr1-dev

* commit '732b2ba79a17ed5c0e4d9d7abb6ec3dfe50d45e8':
  Don't include system/core/include/arch/<arch>/Android.mk for apps-only build.