tree bd23f73a403765b38211fcc0070d51396f649d11
parent 733057f12f987576d42ea8b6bdaab5c0a4a23ad2
parent 2944c11b1faf6ba694be6d199ae813d6975aed5d
author Anton Hansson <hansson@google.com> 1524128212 -0700
committer android-build-merger <android-build-merger@google.com> 1524128212 -0700

Merge "Switch make over to use the new prebuilt modules."
am: 2944c11b1f

Change-Id: Ia2035f6c06ade38e39ce46b00ef3c7c415403a46