tree 56c8e5fc5fb7b396c95822d4f0be07645c8b95d1
parent aaa67596dff0833f124bd111da746e39c5c5bcec
author Steven Moreland <smoreland@google.com> 1509579735 -0700
committer Steven Moreland <smoreland@google.com> 1509579735 -0700

Update makefiles after AOSP push.

Test: none
Change-Id: If3ce74f4d2250d33820cbd864ff56bba6f9e6b67