Export additional packages.

Change-Id: Ie6fdd6a5fc76b80795c293cd7a591f5bc50acd7c