am ee0a864a: am 300712ec: Merge "Improve SystemFeaturesTest#testCameraFeatures" into froyo

* commit 'ee0a864a84babe4eddf00e70f1a5d6ac9e3a86c2':
  Improve SystemFeaturesTest#testCameraFeatures