Merge "Don't hold sProxyLock while retrieving interface descriptors."
am: ef6fe13c77

Change-Id: Ie54978b2f19e42c47992e04c2f41c55d8c61df5b