resolve merge conflicts of 9d1357c to nyc-dev-plus-aosp
am: 067d95dd2b

* commit '067d95dd2beb5ecbe3b721e1e8787dab2030fc44':
  Fix needless value boxing/unboxing in Am.java (except the Long unboxing covered by a separate CL).

Change-Id: I51a6f37c3713fc19eb068bfad21ab02ab8a5057f