Merge "Revert "Add genrule for the current sdk proto""
am: 65596f4dd2

Change-Id: I3dc885b3707bcd1b6e2d68ab43965720766187ec