am 432cd6dd: Merge "Allow LOCAL_RESOURCE_DIR pointing to dir generated during the build"

* commit '432cd6dd78afe9c23cd0ddf669e4f0f973a17a7c':
  Allow LOCAL_RESOURCE_DIR pointing to dir generated during the build