Fix aospbuild