am 9e808ff7: Merge "Use += to append to target-specific PRIVATE_CLEAN_FILES"

# Via Gerrit Code Review (1) and Ying Wang (1)
* commit '9e808ff70515479458d39abfd64ed11eb55fefbb':
  Use += to append to target-specific PRIVATE_CLEAN_FILES
am cf0a9042: am 9e808ff7: Merge "Use += to append to target-specific PRIVATE_CLEAN_FILES"

# Via Android Git Automerger (1) and others
* commit 'cf0a90426ad969bd2deb66b0c23079842b6c4fa2':
  Use += to append to target-specific PRIVATE_CLEAN_FILES
am 46fa45ad: am cf0a9042: am 9e808ff7: Merge "Use += to append to target-specific PRIVATE_CLEAN_FILES"

# Via Android Git Automerger (2) and others
* commit '46fa45ad76ff63978bd35a07aa5e1d743657bf55':
  Use += to append to target-specific PRIVATE_CLEAN_FILES
Delete frameworks/base/voip use voip-common from frameworks/opt/net/voip

Add voip-common to various files so that its available when booting
and building. Basically everyplace telephony and mms-common where needed
voip-common was added.

In core/pathmap.mk voip is removed as it is no longer in frameworks/base.

Change-Id: Ieaba759a0f69b45c4b8839cbed1fe757cdf190c5
Build libcore without a dep on aapt.

Currently building libcore (i.e. to get the core Java libraries) has a
dependency on AAPT. This is problematic for some users that don't want to pull
in the entirety of frameworks/base, e.g. for Dalvik development.

It turns out that all definitions.mk is using aapt for in this case is 'aapt
add -k <jar> <dex>', which adds a file to a JAR while stripping path info.
This is functionally equivalent to 'zip -j', and this CL just makes that
switch.

Change-Id: I292ecaf9d0321018bb7d2e68a49b2cc81de98a20
Merge "Delete frameworks/base/voip use voip-common from frameworks/opt/net/voip"
No html_dir_files if no LOCAL_DROIDDOC_HTML_DIR.

This removes unnecessary dependency if there is no
LOCAL_DROIDDOC_HTML_DIR.

Change-Id: If9e06b6e478a9cd61f5441aa376d996857ee2fb5
Merge "No html_dir_files if no LOCAL_DROIDDOC_HTML_DIR."
merge in jb-mr2-release history after reset to master
JWQ29
Merge "Add audio-route to pathmap.mk"
Merge "Remove HAVE_DLADDR from AndroidConfig.h."
am b796ce35: Merge "Remove HAVE_DLADDR from AndroidConfig.h."

# Via Elliott Hughes (1) and Gerrit Code Review (1)
* commit 'b796ce353d114328cc16a1f2ad2b1059b03a0c52':
  Remove HAVE_DLADDR from AndroidConfig.h.
am 6463953e: am b796ce35: Merge "Remove HAVE_DLADDR from AndroidConfig.h."

# Via Android Git Automerger (1) and others
* commit '6463953e169bbd559cada7263be363202ed40d02':
  Remove HAVE_DLADDR from AndroidConfig.h.
am 5fb282d8: am 6463953e: am b796ce35: Merge "Remove HAVE_DLADDR from AndroidConfig.h."

# Via Android Git Automerger (2) and others
* commit '5fb282d89d00504772753acf1af63c5b422d21e2':
  Remove HAVE_DLADDR from AndroidConfig.h.
JWQ29B
Umbrella build targets to help engineers verify build

With this change, by choosing the right build target, you can reduce
significant verification build time:
If you are working on the framework, "make target-java" sounds enough;
if you are working on native target code, "make target-native" saves
your time by not building the Java code.
This will help reduce uncaught breakges for by default not everything
is built now.

Change-Id: I5a7c82d3f6372db03bea76155c8d6cc63d988eae
merge in jb-mr2-release history after reset to master
JWQ30
Merge "Umbrella build targets to help engineers verify build"