Merge "Add jarjar rule for android.support.v4" into tm-dev