Merge "get rid of otapackage tools" into cm-10.1