Merge commit '78eff9f5bd340eb1d105a1825ad936765dee7b14' into HEAD

* commit '78eff9f5bd340eb1d105a1825ad936765dee7b14': (46 commits)
  Revamp resources listing, part 2 (droiddoc).
  Fix "make cts" for refactored libcore
  Deleting test builds obsoleted by libcore reorg
  Fix "argument list too long"
  Work around a bug with <T> ... <? extends T[]> methods.
  Include all resources for unbundled app builds.
  Improve on unbundled app build
  Dist unbundled app.
  Support for unbundled app build
  Changing the footer per legal guidance.
  Allow java source in LOCAL_GENERATED_SOURCE
  Moving junit out of core.jar and into core-junit.jar
  Added libchromium.so to the prelink map in the temp section.
  Fix dependencies on ext2 user images
  Make LOCAL_SDK_VERSION current use correct framework.aidl
  build: Add support for ext3 and ext4 images
  Fix and enable JarJar in Java builds.
  Quiet the build a little more.
  Undo commit: Moving junit out of core.jar and into core-junit.jar
  Moving junit out of core.jar and into core-junit.jar.
  ...

Conflicts:
	core/Makefile
	core/base_rules.mk
	core/config.mk
	core/definitions.mk
	core/java.mk
	core/main.mk
	core/pathmap.mk
	core/tasks/cts.mk
	core/version_defaults.mk
	target/product/AndroidProducts.mk
	target/product/locales_full.mk
	target/product/sdk.mk
	tools/droiddoc/templates/assets/android-developer-docs.js
	tools/releasetools/ota_from_target_files
Merge commit '8056ee21f033a7eba817656b82e1c337b59d0147' into HEAD

* commit '8056ee21f033a7eba817656b82e1c337b59d0147':
  generic.mk: Replaced AlarmClock with newer DeskClock App

Conflicts:
	target/product/generic_x86.mk
Merge commit '9bfd697cffae4b4f2bdbf122c3bbe7920525e718' into HEAD

* commit '9bfd697cffae4b4f2bdbf122c3bbe7920525e718':
  Build BUILD_MULTI_PREBUILT for the prebuilt target

Conflicts:
	core/multi_prebuilt.mk
Merge commit 'e99698b93fb9524bf0694fccadf14f8e33e139bf' into HEAD

* commit 'e99698b93fb9524bf0694fccadf14f8e33e139bf':
  GRG02
  GRF91
  GRF90
  GRF89
  GRF86
  GRF85
  GRF84
  GRF83
  GRF82
  GRF79
  GRF78
  GRF72
  fix build id
Merge commit '89a23411ef0b7c023bbd98bc68b67f33a87962dc' into HEAD

* commit '89a23411ef0b7c023bbd98bc68b67f33a87962dc': (22 commits)
  HRF91
  HRF90
  HRF89
  HRF86B
  HRF86
  HRF85
  HRF84
  HRF83
  HRF82
  Increase memory for Javadoc.
  HRF79
  Change branch name to openmaster, to avoid confusion
  Add LOCAL_JNI_SHARED_LIBRARIES_ABI build variable.
  extfs support for img_from_target_files
  Revert "Build BUILD_MULTI_PREBUILT for the prebuilt target"
  HRF78
  Move definition of build-userimage-ext-target to build/
  Require a directory that could actually exist.
  Fix the build: properly detect the BUILD OS version of Java, not the host one.
  HRF72B
  ...

Conflicts:
	core/Makefile
	core/build_id.mk
	core/config.mk
	core/definitions.mk
	core/main.mk
	core/multi_prebuilt.mk
	core/version_defaults.mk
	target/product/generic.mk
	tools/releasetools/img_from_target_files
Merge commit '833e62400e7ecfea3df188b99b6639708fe36963' into HEAD

* commit '833e62400e7ecfea3df188b99b6639708fe36963':
  Update platform version strings for AOSP

Conflicts:
	core/version_defaults.mk
Merge commit 'baff089c37b6ad5e317ffb1dc1f08905e873ae8a' into HEAD

* commit 'baff089c37b6ad5e317ffb1dc1f08905e873ae8a':
  Enable ICF link-time optimization.
Added support for building HTC Desire files
Add the keys I used to sign the market version of Superuser.
Added usertags for busybox and su
add support for overriding build.prop settings.

Change-Id: Ie4224d608b7bcb0c2087bd77bc954f8f5f9b6495
allow PRODUCT_SPECIFIC_DEFINES

Change-Id: Ibba03697d49b948a73b6cd3a54098ac6696d0a63

Fix issues with PRODUCT_SPECIFIC_DEFINES that broke in Froyo.

Change-Id: I3a7a64e76ae46d9f8ef71db4eb59b27a7438d5a3
build: Add BOARD_GLOBAL_CFLAGS option

Change-Id: I799e4b241dfd2228f005b3bc2ef549ae18323b05
allow build utc override
Remove the build date assert.

We don't care if you downgrade.

Change-Id: I4d077a86ce939db6948182c19a9052c1fea30f25
Allow override of device asserts, including multi-device support.

Set in board file with TARGET_OTA_ASSERT_DEVICE.
Allow target to provide recovery kernel and init.rc

Change-Id: I41b5bd5588c68513a46ee21967b4ce3a099d62be
armv7-a build: allow for board customization of CPU/FPU target

to cover the entire gamut of CPU and FPU compilation types possible
with ARMv7 (uniprocessor vs SMP, no-FPU vs VFPv3 vs Neon, A8 work-
arounds required vs unnecessary), the compilation codepath needs to
be specified by the BoardConfig.mk to ensure that the OS matches the
target hardware.

add TARGET_ARCH_VARIANT_FPU, TARGET_ARCH_VARIANT_CPU and
TARGET_CPU_SMP makefile variables to allow for target-directed
compilation flags.

Change-Id: I7cc6b8b5e765ebefc0eecd75800aefe8c39d8846
Changes necessary for ClockworkMod recovery.

Change-Id: I893e9ea55d28800714cc84e05683c3d78e5cd07e

add unpackbootimg to the otatools

Change-Id: I219131d481cefae5159ffe735a771d3c65da9345

create a target for utilities

This commit also contains lots of things manually picked from the CM
build repo for full support for building the recovery image on
various devices.
Also look at ro.product.board.