change hikari to aoba
initial aoba support
Merge branch 'aosp-4.4' into aospxs-4.4