Merge "Improve code style in Struct.java and add tests for Type.U64 represented by long primitive." am: 2626b4fd9d

Original change: https://android-review.googlesource.com/c/platform/frameworks/libs/net/+/1455947

Change-Id: I8ef90e52ca6308ab8ed42d53bfb25238eb89cb97