Fixed the build

Change-Id: I17ff54f333eb41a7d246a36dfe71a88774d38a68
Signed-off-by: Chris Conley <chrisc93@vt.edu>
Merge branch 'ir' of git://github.com/chrisc93/android_device_samsung_jf-common into beanstalk