Merge "Re-submit "Add genrule for the current sdk proto"" am: 630e3ac6 am: 65ccfa9c am: 66d7bd23 Change-Id: Ib56c6b79ad7c32b460dcb533d7a2bfc3024cb857