bringup to 4.2.2 / AOKP changes
- bringing back AOKP's build temporarily to see if things have improved...