From: Phil Weaver <pweaver@google.com>
Date: Tue, 18 Jul 2017 21:46:25 +0000 (+0000)
Subject: Back-port fixes for b/62196835 am: fd0ca151a6 am: 3c4d24923c  -s ours am: 68efc2e5b5... 
X-Git-Tag: android-x86-8.1-r1~88^2~1^2^2~10^2~42
X-Git-Url: http://git.osdn.net/view?a=commitdiff_plain;h=c8b0ffd0e8b9fac36e5fcecdd13399bc8ed46b04;p=android-x86%2Fframeworks-base.git

Back-port fixes for b/62196835 am: fd0ca151a6 am: 3c4d24923c  -s ours am: 68efc2e5b5 am: e06843fe7e am: e11e076fed am: 62eca82f89 am: 83261a8b5c am: b968d99e3e am: a1dca32957 am: 79c476704f am: faded53018
am: 3700014be0

Change-Id: Ib0ab12f33da6a6a6f245fa4f2eab949becf42798
---

c8b0ffd0e8b9fac36e5fcecdd13399bc8ed46b04