From: Robert Shih <robertshih@google.com>
Date: Thu, 14 Jul 2016 23:06:31 +0000 (+0000)
Subject: DO NOT MERGE - Fix build am: bf835e4525 am: 98b31b9270 am: 1038762b09  -s ours
X-Git-Tag: android-x86-7.1-r1~24^2~8^2~2^2^2^2^2^2^2~28^2~6
X-Git-Url: http://git.osdn.net/view?a=commitdiff_plain;h=0576ffb637;p=android-x86%2Fframeworks-av.git

DO NOT MERGE - Fix build am: bf835e4525 am: 98b31b9270 am: 1038762b09  -s ours
am: 5d925fce78  -s ours

Change-Id: Ie8c4b4df445063c09bfaf9a1e987798c6d1df978
---

0576ffb637b638535e9de33eb0ed9657c0122b46