Added py2 and py3 subpackage
- Incomplete test subpackage is removed
Change-Id: I52dca6164baced6b73d0965bdcf0e6fe73726589
(cherry picked from commit 296abb5e9aee5019ea22b4f2235f12fae2916a43)
(cherry picked from commit 5d92ce039bd825fa4ad46d5a0e07751e1f067139)
(cherry picked from commit 13b324f089005e736caa54ee9ab0e6528f068dc1)