Merge "Update makefiles after AOSP push."
am: 9d4c21f9af

Change-Id: I00acd9f3e8bdb7894268f1e7a405e449e27d0085