Round and Round

Change-Id: I9cd10aa4bd17a09ae428c79e52f1edf2cdd406be
Signed-off-by: Dirk Rettschlag <dirk.rettschlag@gmail.com>
Merge remote-tracking branch 'aokp/kitkat' into kitkat