[automerger skipped] Merge "Addition of jarjar rules." am: 80b14eb4bc am: 7c86a765cd am: 413c41bdb5 -s ours
am skip reason: Change-Id Ifda90110ac19b3725c5b466d86b7da1abeb33b01 with SHA-1 1c25d44137 is in history

Change-Id: Ief3a41c3878fe33a3f8dc89f0001bdf4a804161a