am fd671b2d: Merge "Add the new \'settings\' shell tool to the build" into jb-mr1-dev
am fd671b2d: Merge "Add the new \'settings\' shell tool to the build" into jb-mr1-dev

* commit 'fd671b2d5feb158fbcf6598ec1ae8d0654c70c35':
  Add the new 'settings' shell tool to the build

xorware/android_build,xorware/android_build,xorware/android_build,xorware/android_build,xorware/android_build