Merge remote-tracking branch 'hexene/stagefright'