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

Change-Id: Ib8775fb92615301f42d8692ef0a1c75ef1a59259