Merge "Convert implicit rules to static pattern rules"
am: b6c317df1a

Change-Id: I8a2efde176fe376864a1ce6444aa79a22a9dc44c