resolved conflicts for merge of 2c311be7 to honeycomb-plus-aosp

Change-Id: I806c7b4ae95f66df621587e52497dd8739a115fe

diff --cc AaptAssets.cpp
Simple merge

diff --cc AaptAssets.h
Simple merge

diff --cc Command.cpp
Simple merge

diff --cc Package.cpp
Simple merge

diff --cc Resource.cpp
Simple merge