Fix build
Signed-off-by: PipelinerArd <kristoferard@gmail.com>
Merge branch 'jb-mr2' of https://github.com/AndroidCommander/platform_frameworks_base into jb-mr2