fix some ifdef

Change-Id: Id49663eb1b71ef683c6850962850aa0c9ed177c0
Merge branch 'cm-12.0' of github.com:TheMuppets/proprietary_vendor_sony into cm-12.0