resolved conflicts for merge of 7be88d00 to honeycomb-plus-aosp

Change-Id: I2f1b26f737dcc521e5a81a660356468eca6d2717

diff --cc core/main.mk
index 6750baa,7f37f0e..ddcb591
--- 1/core/main.mk
--- 2/core/main.mk
+++ b/core/main.mk
@@@ -399,7 -390,7 +399,8 @@@ subdirs := 
        development/host \
        development/tools/etc1tool \
        development/tools/line_endings \
+       development/tools/emulator/opengl \
 +      external/clang \
        external/easymock \
        external/expat \
        external/libpng \