am 0bb9ce9e: fix build -- aidl was not finding vpn imports

Merge commit '0bb9ce9ec3d744444019f8ea191bb63f0ba3b2d4'

* commit '0bb9ce9ec3d744444019f8ea191bb63f0ba3b2d4':
  fix build -- aidl was not finding vpn imports