Initial merge of libepoxy from upstream
am: 174d119401

Change-Id: Idc32c43d39f5d5b3b47f5fd43db3dc9f81aa72bf