Merge "vndk-def: Add empty lines between blocks"