Merge "Remove unneccessary TARGET_BUILD_APPS conditional" am: e416a5f716
am: 1452e0a389

* commit '1452e0a389a24a6515bc8915076a93155f7bbced':
  Remove unneccessary TARGET_BUILD_APPS conditional