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

Signed-off-by: Paul Beeler <sparksco@gmail.com>
Manta: Mark internal storage as primary

Change-Id: I6c73b859736d48d7c2279beedda44ceb6a3d5146