Merge "Filter out the overridden packages before doing required module expansion." into jb-mr1-dev
JOO54E
Merge "ARM: put crtbegin_so.o at the beginning where it belongs"
am 713bac96: Merge "ARM: put crtbegin_so.o at the beginning where it belongs"

* commit '713bac96d628d6ca040fb1fe5d7a8abdcb932553':
  ARM: put crtbegin_so.o at the beginning where it belongs
am dbf6ad06: am 713bac96: Merge "ARM: put crtbegin_so.o at the beginning where it belongs"

* commit 'dbf6ad0692f98cacf27dc023854b2c5a5575a841':
  ARM: put crtbegin_so.o at the beginning where it belongs
JRO03T
Follow symlinks in findleaves

If we replace the project directories with symlinks to the actual
directories, everything should build fine.  Unfortunately, without
this fix, it does not.

Change-Id: Id19fef9696d0f599a7b3a14b6a8fc10ae857f9c7
merge in jb-mr1-release history after reset to jb-mr1-dev
JOO58
Define the proper macro "GTEST_OS_LINUX_ANDROID" for native tests.

Bug 7050760

Change-Id: I05e69b741eaf628ab1d25dec12a953f9f2a3d9a2
Merge "Define the proper macro "GTEST_OS_LINUX_ANDROID" for native tests." into jb-mr1-dev
JOO58B
JRO03U
Include all standard shared library paths in /system/lib

Signed-off-by: Chris Dearman <chris@mips.com>
Change-Id: Ib33ce42532cc8cedc6f48036a257a2a225c82a69
Include stock Dreams in the build.

Change-Id: I61953eeb50f8f02845468bc11c723405d5641d7f
Reconcile with jb-mr0-release jb-release - do not merge

Change-Id: Ibe50742a45ef532acf13f4edb8166b6e6c1ef30c
am 28f37bb9: (-s ours) Reconcile with jb-mr0-release jb-release - do not merge

* commit '28f37bb992853a877980ea0d1040df2e46ee71c1':
  JRO03U
  JRO03T
  JZO54
Automatically add Java resources carried by static Java libraries.

Bug: 6892294
Change-Id: I3ff71ee3d7b9ccdfde6a5284cc350864fbffa71f

Conflicts:

	core/package.mk
Merge "Automatically add Java resources carried by static Java libraries." into jb-mr1-dev
Keep the emma classes if emma is enabled.

Change-Id: Ie551d48532c61bf610b12875dc33cfe476625c5e