Merge "Convert implicit make rules to static pattern rules"
am: 56ded7fe40

Change-Id: I7aa17d859e487b0b7e9d4b7af0cf1e4c2a7ff02f