Merge "Include headers and props to VNDK snapshot"