Build fix

Change-Id: Ifd4fad58b74aab174380e96f5e8d91cac50ddc1b
Merge branch 'jb43' of https://github.com/ParanoidAndroid/android_build into jbl43