am ba35b2d6: resolved conflicts for merge of 162991be to gingerbread-plus-aosp

* commit 'ba35b2d61531a071533891307904e6ad7f81fb65':
  Allow uninstallable APPs.