Merge commit '3d6ea3bd8690934dbcdb11aa84ae0bb22e211c28' * commit '3d6ea3bd8690934dbcdb11aa84ae0bb22e211c28': The aapt and aidl tools are prebuilt when we're doing an apps-only build, so don't try to build them.
Merge commit '3d6ea3bd8690934dbcdb11aa84ae0bb22e211c28' * commit '3d6ea3bd8690934dbcdb11aa84ae0bb22e211c28': The aapt and aidl tools are prebuilt when we're doing an apps-only build, so don't try to build them.