Remove unnecessary cache alignment fixes am: e764f38a4b am: cc5060bedc
am: 119a2938ee

Change-Id: I51d59c8b630cfd0b36978f82ff2364efa8d04aa7