Return external/oprofile to AOSP upstream master