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

Change-Id: Ib7d44b5d8756618638bf8a53e223f37fe1a42aaa