resolved conflicts for merge of e8bb5c3a to klp-modular-dev-plus-aosp

Change-Id: I5cb6aeb5dd250aeba059feb1c70c13ac4745db3b

diff --cc core/64_bit_blacklist.mk
index ea72967,0171e67..1b07022
--- 1/core/64_bit_blacklist.mk
--- 2/core/64_bit_blacklist.mk
+++ b/core/64_bit_blacklist.mk
@@@ -22,11 -20,6 +20,7 @@@ _64_bit_directory_blacklist += 
        external/oprofile/opcontrol \
        frameworks/av \
        frameworks/base \
-       frameworks/ex \
-       frameworks/ml \
-       frameworks/opt \
-       frameworks/wilhelm \
 +      frameworks/native/cmds/idmap \
        device/generic/goldfish/opengl \
        device/generic/goldfish/camera \