Merge "Revert "Add genrule for the current sdk proto"" am: 65596f4dd2 am: 9c2f394c49
am: 0e4e057e6b

Change-Id: Ia7e77379b033e4409f30f473b1dfdab489b4ea68