And encapsulate the aidl interface implementation. Change-Id: Id9a2544b411648e2596de18682079a64e95b0710