Make dist-specific subdir in package export dir

Change-Id: Ib1ed5e1d6b781a14181e3b2846d47d87f7eb8c37
Merge "Make dist-specific subdir in package export dir"