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

Change-Id: I2b8947ad3a48bdac90e50e442d8e7f26fdaf1263