more cleanup of aries-common tree for android 4.2 merged from cm/cm-10.1 branch.