Merge changes from topic "am-424aeccbae9040a69c4b15daaf596295" into tm-d1-dev-plus-aosp

* changes:
  [automerger skipped] Merge "Add jarjar rule for android.support.v4" into tm-dev am: 3e5bd5cad1 -s ours am: f5ab4402b3 -s ours
  [automerger skipped] Add jarjar rule for android.support.v4 am: e3bb3a8960 -s ours am: eece291d0f -s ours