Merge "SEAndroid: additional policies for location"