Merge "Use binder rather than kernel ONEWAY flag." am: dc5eade0cc am: edcecd9ed9
am: cb4d5f44ad

Change-Id: I33a4b353466687cb34433f7a3bf54dabc01ffd6d