Merge changes I0d65bcdc,I7499691c

* changes:
  vndk-def: Generalize FWK-ONLY-RS / VNDK-SP
  vndk-def: Support Treble VNDK directory layout