Merge "Merge "NdkBinderTest: cleaner API for making SpAIBinder" am: 5d6d9c6704" into stage-aosp-master am: b5167914ef
am: dceaa6a2a9

Change-Id: Ia483157a8752b94a51c31db0f9e7615d8d7eb7a4