Merge espmartin/vendor_aokp's testing branch into kitkat