Merge changes Ia517b85f,Ia7b9db53 into pi-dev

* changes:
  Make liblight build with the VNDK.
  Make libqservice build with the VNDK.