Merge \"stagefright: update temporal layering selection in MediaRecorder\" into nyc-mr1-dev
am: 8dcd820534

Change-Id: I6ae23ad45ae59d3f450ebf53ceba13e6ad0a6b43