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

Change-Id: I8677d9aacf463c68329cd73378a7968473189454