Merge "Type pkgs w/ unsupported types in Java now work" am: 54618b461d
am: ca27dce23a

Change-Id: Ie9b5c7b718c84c00a74e614d7a06fbabf81e420e