Mako rejiggering

Squashed commit of the following:

commit 9a345b2c65a4f5aed0d60e494501a5aff6523942
Author: emccann <emccann@cs.uml.edu>
Date:   Sun Apr 14 12:18:09 2013 -0400

    Reapply Werror fixes to display

commit 73b3a4537d3d9ff352616d89a978f2bc18127385
Author: emccann <emccann@cs.uml.edu>
Date:   Sun Apr 14 12:04:58 2013 -0400

    Use vanilla aosp qcom display

commit d8759d134d3d7da80622dfd41b94198cb3b97ff1
Author: emccann <emccann@cs.uml.edu>
Date:   Sun Apr 14 12:04:02 2013 -0400

    Rebase qcom gps and media linaro fixes onto android-4.2.2_r1

commit 1ed454729ea9cfe9e2b0b3746893a045b07a2dd9
Author: emccann <emccann@cs.uml.edu>
Date:   Sun Apr 14 11:56:25 2013 -0400

    Use AOSP's qcom guts where able

Change-Id: If20ae5f1ae7b48f73feecdb50506758deb0b1190