In constructor, also check for ArrayBuffer

Change-Id: I6671bfc1ea5c6006c31c92f6fb918fdca09a360b