Merge "Track Proxy change in libcore"
am: 8fcfdc65e0

Change-Id: I7bfc503ab6b6442f9ad4990425ffc6daf16225fe