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

Change-Id: I57b69f94665c8d3ec0f64c896c4941a451b80169