Merge of Sony Release 9.1.A.0.489

Change-Id: Ieca3a0792cea463841deef8ec26566514e8c7ab1
cyanogen defconfig

Change-Id: Ia6eb24cd0d4e4a94212430f44f86411b90158939