Undo change from linaro to aosp

Change-Id: I9d00b6421d0a8f9fbf43d25bdcfd91c466f08428