Fix some issues:

- Module name being used instead of package name
- compile SDK version breaking on sample creation

Change-Id: Ie503d237f311e8a84da3a28cf29860ee2af36f8d
4 files changed