Merge "vndk-def: Rename eligible list with API levels" into pi-dev