Merge changes I2a74050d,Icbb36590

* changes:
  vndk-def: Rename eligible list to use API level
  sourcedr: Find system files from vendor sources