Return LatinIME and Calculator to AOSP