Merge "Doc change: Update uses-feature and permissions docs." into froyo