tree eef727dc2cd11610488711f554e3aca14257f38a
parent ef0ecdc9e695e0106877228d54c7a3756d45fb3d
author Marty Faltesek <mfaltesek@google.com> 1456185791 -0500
committer Marty Faltesek <mfaltesek@google.com> 1456189983 -0500

Revert "Merge backports 20160122". Leads to build failure on
windcharger.

This reverts commit ef0ecdc9e695e0106877228d54c7a3756d45fb3d,
reversing changes made to cb509d1fb736fdb053698d9497b5c98e67468623.

Change-Id: I0919423c9a7400e057e9557974697529580107ff