Fix l900 (Sprint Note 2) dependencies
Merge remote-tracking branch 'upstream/cm-10.1' into cm-10.1