am 36dad9b8: (-s ours) am b04ec6a8: (-s ours) am 7a7ed2b2: Merge "Do not check features in PackageManagerService DO NOT MERGE" into gingerbread

* commit '36dad9b86cc59e0038671b0e0223e05c2e1ee599':
  Do not check features in PackageManagerService DO NOT MERGE