am 361881b8: Merge "Separate JniDataUtils::constructAttributeMap()."

* commit '361881b82b387345ca8ddfad401feb71c21bee55':
  Separate JniDataUtils::constructAttributeMap().