Merge \"ART: Add pointer-size template to some reflection functions\"
am: 3023890d94

Change-Id: I4310ad3ef62f7645ff82427512f0ef975f386341