Merge changes I54a4a41a,Ic067c9c3,I491f40dd,I3a2ce935,I3df2549c,Icba928ce

* changes:
  Make ActivityManagerService just kill apps when they crash on headless devices.
  Add support for disabling wallpaper service
  Fix merge problem
  Add the ability to pass float extras to AM.
  Adding a feature to indicate specific support for Bluetooth API.
  SystemServer: Add support for disabling AudioService and MountService