Fixed package names so tests project underneath can compile Change-Id: Ia4e58e8caa5db65e05fdb2ec64e52c1564774899