Merge "stagefright: fix buffer array population for secure input"