Merge "fault_inject: Don't select frame pointer with ARM unwind" into msm-3.0