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

Change-Id: I7f57437fd115e6e5d6b569d31e286c3b65b6e6d6