Merge "Support binderized and passthrough vendor services" into oc-dev
am: 25197f0f6f

Change-Id: Ia44472c4b20f1e3128d830665af23947c235cfed