Merge "Addition of jarjar rules." am: 80b14eb4bc am: 7c86a765cd

Change-Id: I5abbe4c9ac8e536f387f0658c6645a9520d37b4b