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

Change-Id: Id5fb16543fc4a71f03728a0745ca3d1f0f1e0d54