Merge "Add genrule for the current sdk proto" am: 2df0a1096a
am: 21699364c4

Change-Id: Id23e79f66227c2b895603ffea0c42175f0cfb129