Remove stagefright patch
Minor changes
Merge upstream changes