am 6a275202: am 1e4adfa8: (-s ours) Merge commit \'8113e43601aac7702b9ec007e81a179826...

am 6a275202: am 1e4adfa8: (-s ours) Merge commit \'8113e43601aac7702b9ec007e81a179826143d1e\' into HEAD

* commit '6a27520295601f53ae80d1e764e072162e9f481c':
  Try to catch more misuse of $(my-dir).
  Revert "Remove external/chromium from the 64 bit blacklist."
  Remove external/chromium from the 64 bit blacklist.
  OProfile is no longer compiled now.
  Amend 64 bit blacklist.
  DO NOT MERGE: Revert the revert now that tcpdump+64bit=ok
  DO NOT MERGE: Fix aosp 64bit build. tcpdump+64bit=bad
  Remove external/tcpdump from 64-bit build blacklist.
  oprofile/daemon doesn't build for x86_64.
  Remove external/wpa_supplicant_8 and external/android-clat
  Take libcore off the LP64 blacklist.
  HACK: add 64-bit directory blacklist
  add support for module supported or unsupported target architectures