Merge "Decouple libstagefright from Codec 2.0" into pi-dev