From: Adam Seaton <aseaton@google.com>
Date: Thu, 17 Nov 2016 19:50:33 +0000 (+0000)
Subject: Merge changes I30f397b0,I717a6f03 into lmp-dev am: 1a242b67fe am: 27ac4ac1da am:... 
X-Git-Tag: android-x86-7.1-r1~45^2~16
X-Git-Url: http://git.osdn.net/view?a=commitdiff_plain;h=777b8bb190;p=android-x86%2Fbuild.git

Merge changes I30f397b0,I717a6f03 into lmp-dev am: 1a242b67fe am: 27ac4ac1da am: ac64c64f9a am: 618f64d183 am: d635edfd04 am: 6f0c3f4bdc am: c5ecbe4047 am: 4a45d769e9 am: e033ae9cff
am: 8185ca3cd3

Change-Id: I6dc1ad0fb19ca478f786274c355f7ad71871a6e3
---

777b8bb1907d226375544627430066fe7cbba25e