Full reconcile with CM

I think we have some taint
Now let's see if this compiles strictly

PS2 - return out android.mk

Change-Id: I8fa23d94a4a17fef48626320e5315d427d8b414b