Merge "Add art-ndebug target to target_config.py" am: bb5fd1bff1
am: fb3be7687e

Change-Id: I71156d322b020b54b4df5330ba81f058f21025f3