merge from AOSPA-legacy

Shit... 511 commit and more than 1000 conflicts