From: Marco Nelissen <marcone@google.com>
Date: Fri, 20 Oct 2017 00:04:39 +0000 (+0000)
Subject: Fix build am: 48caffe6fe am: 1da4542abd  -s ours am: ab486b087e am: 04b334a98d am... 
X-Git-Tag: android-x86-8.1-r1~25^2^2^2^2
X-Git-Url: http://git.osdn.net/view?a=commitdiff_plain;h=6abd03fa5d;p=android-x86%2Fframeworks-av.git

Fix build am: 48caffe6fe am: 1da4542abd  -s ours am: ab486b087e am: 04b334a98d am: f231e8b680 am: 31b9dbb43b am: d799181f51 am: 7edb039dde am: 7cc9d6763e
am: 5ff79c2a46

Change-Id: If3196859118493351493ead6775fe2fdc890df32
---

6abd03fa5de5ff79169191ae9f9ee7a975e60d55