Fix typo.

Change-Id: Ia72ed2bef54751dc2d6c3379a58de95a0e9ebfdd
Merge "Fix typo."
Merge branch 'master' of https://android.googlesource.com/platform/frameworks/av