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

Change-Id: I293a5f376e41bdd84e9c1a2795536ccff22492d6