2 ms·

You can always just take the vendor overlays and build JB-AOSP. Then you don't have to wait for merges.