[US128.2] Rework genyd architecture
[US128.2] build tweaks
[US128.2] No need for that
Merge branch 'US128.2-move-genyd' into US128.3-java-api

* US128.2-move-genyd:
  [US128.2] No need for that
  [US128.2] build tweaks
  [US128.2] Rework genyd architecture

Conflicts:
	Android.mk