Merge "Re-submit "Add genrule for the current sdk proto""
am: 630e3ac68d

Change-Id: I14797601fe60c730b325914a03643a81fd8a5152