fix build

*missing from 4.2.2 merge

Change-Id: I1dd9710d41a2d2fb0a8a326a4d64cc6987706eef
Signed-off-by: Jonathan Steadman <xxwhitehawk@gmail.com>
Merge remote-tracking branch 'aokp/jb-mr1' into jb-mr1