Merge "Enable framework GPS and location manager logging" into gingerbread