Rename CalculatorActivity back to Calculator

Bug: 15907395
Change-Id: Idc3445230c541bdf50cc3b15187c0776010ccff3
2 files changed