Merge "andriod.location.Criteria: Simplify new location criteria APIs a bit." into gingerbread