Merged updates from jb-mr1.1-release of aosp
serviceManager: Merged updates from jb-mr1.1-release branch of aosp
aapt: Merged updates from jb-mr1.1-release of aosp
services: Merged updates from jb-mr1.1-release of aosp