Merge "[vndk] Cleanup OWNERS files"