Merge "Remove unneccessary TARGET_BUILD_APPS conditional"
am: e416a5f716

* commit 'e416a5f71638bc324a368e4c66a4834117322c7a':
  Remove unneccessary TARGET_BUILD_APPS conditional