Use AOSP for Uri and UriMatcher.

Methods that were still shadowed didn't reference anything from Android that needed to be shadowed. 

Also, the implementation of UriMatcher had bugs with the results returned based on ordering of addUri. The test with matcher.addURI(AUTH, "transport/*/#/type", 4) is actually incorrect and will return 3 since the "*" wildcard is specified before.