Merge commit '9a2b2f76' into froyo-plus-aosp * commit '9a2b2f76': Don't build dx if it's an app-only build.