Squashed commit of the following:

commit 88f4fddab82fe1a65c016df6f6bdfde340e45651
Author: DHOMD <DHO@dho.im>
Date:   Wed May 7 12:53:16 2014 -0400

    Staging for M8

    Change-Id: I83a81b0a7bea8918ecdf8757493f2807607d72b5

commit 618e74342b58b6018606b5df349c370ef069a09b
Author: nuclearmistake <nuclearmistake@gmail.com>
Date:   Tue May 6 21:23:14 2014 -0400

    OmniSwitch: track sha1 before incompatible immersive change

    might be an easy FB tweak, but the means outweigh the gains.

    Change-Id: Ia71512c9d855a18e374a8e8d18df7e0f887c69a8

commit 31ad3b32035c7eb8dee406695e7583f4e6b9536e
Author: Steve Kondik <shade@chemlab.org>
Date:   Tue May 6 03:18:25 2014 -0700

    Add FFMPEG and stagefright-plugins to the project

    Change-Id: Iec58ed53f953304d8b78fd7561548fa771b33349

    Conflicts:

    	default.xml

commit b70b145dbbda449d303a692bf79556dee75b95ce
Author: DHOMD <DHO@dho.im>
Date:   Mon May 5 17:51:35 2014 -0400

    Follow our own p880 until to fix build

    At least until CM fixes their cmhw

    Change-Id: Ia076ed791955f83f5729b0789b18b23f0766151a

Change-Id: I2b10fca7de5d7f06e578f5ff920a374fdf2bccd7