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

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