Merge "vndk-def: Add command line option checks."