Merge branch 'jb-mr1-release' of https://android.googlesource.com/platform/system/core into mr1

Conflicts:
	adb/Android.mk
	adb/usb_vendors.c
	include/private/android_filesystem_config.h
	include/system/audio.h
	include/system/camera.h
	init/property_service.c
	libnetutils/ifc_utils.c
	mkbootimg/mkbootimg.c
	rootdir/init.rc

Change-Id: Ie42f0c14808e9f8cabd24854bfe15b6667955229
Revert "libcutils: Fix aliasing violations"

This reverts commit 826d75fb6dcefe8a6c6d4d54a7d215553945812a.
Breaking build with 4.2

bionic/libc/include/string.h:105:33: error: call to '__memcpy_dest_size_error' declared with attribute error: memcpy called with size bigger than destination
bionic/libc/include/string.h:109:32: error: call to '__memcpy_src_size_error' declared with attribute error: memcpy called with size bigger than source

Change-Id: I777e5f5cd87fb972c833ef6bd81b23cd29878e9b
Revert "init: Check for symlinks with lstat() not open()"

This reverts commit f3e86113ceae0e58735ca99754d77b1b9d1a83b5.
adb: Fix missing header paths

Change-Id: I570b631ced11ab104aafe7ebfe71bae4e380d8af
Revert "init: Add support for properties expansion in exec command"

This reverts commit 590e70506cab66bd6b41adfd15ef09bb42df2953.
Revert "init: Implement exec support"

This reverts commit 2f0ed0d3ced82e53b1fc1f994c6bd3e97683264c.

Change-Id: Ia0754c913da3d20c4e0c207ca479c043d394944e
Add support for exec command in init scripts.

Change-Id: Iee523fd75410718f0bd090f5fdcba50825a698c4
init: Add support for properties expansion in exec command

Add Android properties expansion to 'exec' arguments.
E.g.  exec /system/bin/log ${sys.usb.config}

CRs-Fixed: 390942
Change-Id: Ie520396d951e578bd9f591734a45d2f460b8f51d
Deprecate distinct boot paths for androidboot.emmc

Qualcomm used to require a "on emmc-fs" to distinguish multi-boot
devices, in replacement of the usual "on fs". This distinction has
been deprecated in jb, and it's breaking mako

Change-Id: I8ef5c932efcd5e7f8d6f6fce0915683d84c3ee11
Fix /cache permissions for the dexopt cache

Change-Id: Ibbecac2b5a89d7fa7fb09c5be1d2bc3db766f885
init.rc: Move CM's sysinit to the init.cm file

Its current location is broken due to a race condition, anyway...

Change-Id: Ic371455521d10fc09c81331c4c4faeab5cfb89d1
ramdiskaddr is now ramdisk_offset

Change-Id: I3bf83af5f7001f581506dc7fd9b1eb653334ad35
toolbox: new applet restart

- stop + start
- for the lazy.

Change-Id: Ie0ef0e27f5b7819a5575ece6b82c5813f4e38420
init: Bring back support for arbitrary chargermode cmdlines

This was accidentally removed while debugging the init breakage
fixed in change I8ef5c932efcd5e7f8d6f6fce0915683d84c3ee11. Put
it back

Change-Id: If35b9d5db281f8aab6de26f2bb63717d28b2db30
libion: Support for old ION API

 * Kernel 3.0 doesn't have heap_mask or SYNC ioctl, so add a board flag
   so that proprietary code that uses the old kernel API directly still
   works.

Change-Id: I4227c79a5de46c60eeebd2e16ca88dd6d580916a
rootdir: Add mediaserver to qcom_diag group

 * QCOM audio drivers need this.

Change-Id: I3cba0356e2995951208fee5e180e56b1afbc7158
Fixed improper size displaying in 'df' utility

'df' command used to display filesystem usage statistics as integer
values, in most cases rounding the actual value down. Because of
that 'df' tended to display faulty size values.
This fix to 'df' utility calculates the fractional part of the size,
then it rounds it when needed to the nearest one-digit integer value
and displays after decimal dot.

Change-Id: I9bc52635d45d3e55ce61b3b1c6b80d1267516e75
Signed-off-by: Chirayu Desai <cdesai@cyanogenmod.org>
liblog: add required function

Some Motorola proprietaries require a function named __android_log_loggable. This
change adds the function and solves problems with radio and other
binaries on qualcomm based Motorola phones. This code is activated with
TARGET_USES_MOTOROLA_LOG:=true

Change-Id: I722b42d34198c027f265c3cf9f220d9798814915
Revert "init: Never allow two same-service processes to exist simultaneously."

This reverts commit abe57d0b4e994e31eb31ec98dfa6d4b74e29502e.

Revert "Restart oneshot services when manually restarted."

This reverts commit e889a4746b6f3cd1c6749312c255b14eedc5f778.

Revert "Safely restart services to avoid race conditions."

This reverts commit 9d1a567eb0d6ac8d0040228e7c41668c8e3eb37e.
camera: Remove histogram commands

Change-Id: Ice4012922936ee1d0f9005797f72f9f2b38b951c