Merge "Change database package name align with the directory name"
am: bd6b6a6284

Change-Id: I587ffd334601c6f4082f1040e283ce5e9d547eec