Merge "Create dir in /data for vendor customization"
am: c39a31f002

Change-Id: Icc41ac9e849afd0250944ff8cc3b00e3b78ed52b