Merge branch 'android-4.9-q' into int/11/fp3

* android-4.9-q:
  UPSTREAM: ipv6: raw: Deduct extension header length in rawv6_push_pending_frames
  UPSTREAM: netfilter: ipset: Fix overflow before widen in the bitmap_ip_create() function.

Change-Id: Id7ae4683925aa9b2405f05d79c8c146cf0430cf2