Merge commit '94e8f740c97d8b7d7c550c03b46a45c3375fb369' of sso://googleplex-android/platform/frameworks/av into HEAD

Change-Id: Ib9de1a2cf34b3ab46e42a7178805b96bf34056c5