pulling changes from aospa-legacy

since this merge causes massive changes to some files venture specific, will merge from debug repo following this merge....