Merge "Port missing javax.* changes from openJdk8u121-b13, part 1"
am: 3025864255

Change-Id: Ib5138af6e5895e543723840f3cd3821559e97f12