Clean up Japanese APNs

 * Rename and rearrange Japanese APNs to make intelligible.

Change-Id: I628012eb5a2cdc1b4e95ca9a6cf1eaa88eb88b31