merge from open-source master

Change-Id: Ie49d1b19914fcfefedfdfc070800426d4b13dd46

diff --cc core/main.mk
index f830f03,68c1def..043fef5
--- 1/core/main.mk
--- 2/core/main.mk
+++ b/core/main.mk
@@@ -414,10 -398,10 +413,9 @@@ subdirs += 
        sdk/layoutopt \
        development/apps \
        development/tools/mkstubs \
-       frameworks/base/tools/layoutlib \
 -      external/googleclient \
        packages
  else
- $(warning sdk-only: javac not available.)
+ $(warning SDK_ONLY: javac not available.)
  endif
  
  # Exclude tools/acp when cross-compiling windows under linux