resolved conflicts for b638126e to klp-modular-dev

charger/Android.mk

libpixelflinger/Android.mk

libpixelflinger/codeflinger/ARMAssembler.h

libpixelflinger/codeflinger/CodeCache.h

libpixelflinger/codeflinger/MIPSAssembler.h

libpixelflinger/codeflinger/tinyutils/Errors.h

libpixelflinger/codeflinger/tinyutils/KeyedVector.h

libpixelflinger/codeflinger/tinyutils/SharedBuffer.cpp

libpixelflinger/codeflinger/tinyutils/SharedBuffer.h

libpixelflinger/codeflinger/tinyutils/SortedVector.h

libpixelflinger/codeflinger/tinyutils/TypeHelpers.h

libpixelflinger/codeflinger/tinyutils/Vector.h

libpixelflinger/codeflinger/tinyutils/VectorImpl.cpp

libpixelflinger/codeflinger/tinyutils/VectorImpl.h

libutils/Android.mk

libutils/VectorImpl.cpp

libutils/tests/Android.mk

libutils/tests/Vector_test.cpp