Fix regex for AOSP and HellyBean