Merge https://android.googlesource.com/platform/frameworks/native into jb-devel-mr2-staging

Conflicts:
	services/sensorservice/SensorService.cpp