Rename sample and tests to not conflict with frameworks/ex

Change-Id: Icfc924b7acf6c2b82cefde74bfb4f2df46f7fa75
diff --git a/sample/Android.mk b/sample/Android.mk
index d5eef30..e0dd9ca 100644
--- a/sample/Android.mk
+++ b/sample/Android.mk
@@ -23,7 +23,7 @@
 include $(CLEAR_VARS)
 
 src_dirs := src
-LOCAL_PACKAGE_NAME := ChipsSample
+LOCAL_PACKAGE_NAME := libChipsSample
 
 LOCAL_STATIC_JAVA_LIBRARIES += libchips
 
diff --git a/tests/Android.mk b/tests/Android.mk
index 98c338a..21a8050 100644
--- a/tests/Android.mk
+++ b/tests/Android.mk
@@ -16,7 +16,7 @@
 
 LOCAL_SRC_FILES := $(call all-java-files-under, src)
 
-LOCAL_PACKAGE_NAME := ChipsTests
+LOCAL_PACKAGE_NAME := libChipsTests
 LOCAL_MODULE_TAGS := tests
 LOCAL_SDK_VERSION := current
 LOCAL_CERTIFICATE := platform