Merge "Improve SystemFeaturesTest#testCameraFeatures" into froyo