Merge "Include headers and props to VNDK snapshot" am: bd92542b50
am: 103174a5cd

Change-Id: I30f0be3a733a028054905b89617d21a3d93d3ae2