Merge remote-tracking branch 'seandroid/seandroid-4.2' into sm-jb-mr1

Signed-off-by: Paul Beeler <sparksco@gmail.com>