Merge "Update makefiles." am: c202d17fa6 am: 70d20a497e
am: 4e9e47f47e

Change-Id: I1cce7dda484ddf85556db4c03518463edb29604f