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