Merge https://github.com/AOSPAL/android_system_core into android-4.4

Conflicts:
	healthd/BatteryMonitor.cpp
	rootdir/init.rc