Test: Manual verification, and update to genrule_test.go Change-Id: Ic507a35438be5261342a958f3a462a73739e2482