Merge branch 'jb3' of https://github.com/CarbonDev/android into jb-mr2

Signed-off-by: Kristofer Ard <kristoferard@gmail.com>