Merge "Allow apps to process ProxyFDCallback asynchrnously." into oc-dev
am: 76c32a35a9

Change-Id: I9e17751f706f9e0869eefafb77bf1704335f5116